From b154a6ed5b02307076094beeb01367a57b023873 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 3 Sep 2008 03:19:18 +0000 Subject: [PATCH] Temporarily reverted SpecialUpload.php to r37968, before Bryan's changes, pending resolution of issues described by private email, specifically: * No means for an extension to add extra upload sources * initialize() method not generic * stashSession() not generic enough for conceivable alternate UIs * UploadFromUrl still uses $wgOut * Not enough comments --- RELEASE-NOTES | 2 - includes/specials/SpecialUpload.php | 1079 +++++++++++++++++++++++---- 2 files changed, 915 insertions(+), 166 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6c27e8a8c0..9a5f65bc64 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -102,8 +102,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN instead of a hardcoded colon. * Allow to accept image names without an Image: prefix * Add tooltips to rollback and undo links -* Backend upload code has been removed from SpecialUpload.php. This may cause - backwards incompatibility with upload extensions. * BMP images are now displayed as PNG * (bug 13471) Added NUMBERINGROUP magic word * (bug 11884) Now support Flash EXIF attribute diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 44fa6a3ae6..98ccdcb07f 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -19,21 +19,37 @@ function wfSpecialUpload() { * @ingroup SpecialPage */ class UploadForm { + const SUCCESS = 0; + const BEFORE_PROCESSING = 1; + const LARGE_FILE_SERVER = 2; + const EMPTY_FILE = 3; + const MIN_LENGHT_PARTNAME = 4; + const ILLEGAL_FILENAME = 5; + const PROTECTED_PAGE = 6; + const OVERWRITE_EXISTING_FILE = 7; + const FILETYPE_MISSING = 8; + const FILETYPE_BADTYPE = 9; + const VERIFICATION_ERROR = 10; + const UPLOAD_VERIFICATION_ERROR = 11; + const UPLOAD_WARNING = 12; + const INTERNAL_ERROR = 13; + /**#@+ * @access private */ - var $mComment, $mLicense, $mIgnoreWarning; + var $mComment, $mLicense, $mIgnoreWarning, $mCurlError; + var $mDestName, $mTempPath, $mFileSize, $mFileProps; var $mCopyrightStatus, $mCopyrightSource, $mReUpload, $mAction, $mUploadClicked; - var $mDestWarningAck; + var $mSrcName, $mSessionKey, $mStashed, $mDesiredDestName, $mRemoveTempFile, $mSourceType; + var $mDestWarningAck, $mCurlDestHandle; var $mLocalFile; - - var $mUpload; // Instance of UploadBase or derivative # Placeholders for text injection by hooks (must be HTML) # extensions should take care to _append_ to the present value var $uploadFormTextTop; var $uploadFormTextAfterSummary; + const SESSION_VERSION = 1; /**#@-*/ /** @@ -41,7 +57,8 @@ class UploadForm { * Get data POSTed through the form and assign them to the object * @param $request Data posted. */ - function __construct( &$request ) { + function UploadForm( &$request ) { + global $wgAllowCopyUploads; $this->mDesiredDestName = $request->getText( 'wpDestFile' ); $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ); $this->mComment = $request->getText( 'wpUploadDescription' ); @@ -68,45 +85,140 @@ class UploadForm { $this->mAction = $request->getVal( 'action' ); - $desiredDestName = $request->getText( 'wpDestFile' ); - if( !$desiredDestName ) - $desiredDestName = $request->getText( 'wpUploadFile' ); - $this->mSessionKey = $request->getInt( 'wpSessionKey' ); if( !empty( $this->mSessionKey ) && - isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && - $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == - UploadBase::SESSION_VERSION ) { + isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && + $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == self::SESSION_VERSION ) { /** * Confirming a temporarily stashed upload. * We don't want path names to be forged, so we keep * them in the session on the server and just give * an opaque key to the user agent. */ - - $this->mUpload = new UploadFromStash( $desiredDestName ); $data = $_SESSION['wsUploadData'][$this->mSessionKey]; - $this->mUpload->initialize( $data ); - + $this->mTempPath = $data['mTempPath']; + $this->mFileSize = $data['mFileSize']; + $this->mSrcName = $data['mSrcName']; + $this->mFileProps = $data['mFileProps']; + $this->mCurlError = 0/*UPLOAD_ERR_OK*/; + $this->mStashed = true; + $this->mRemoveTempFile = false; } else { /** *Check for a newly uploaded file. */ - if( UploadFromUrl::isEnabled() && $this->mSourceType == 'web' ) { - $this->mUpload = new UploadFromUrl( $desiredDestName ); - $this->mUpload->initialize( $request->getText( 'wpUploadFileURL' ) ); + if( $wgAllowCopyUploads && $this->mSourceType == 'web' ) { + $this->initializeFromUrl( $request ); } else { - $this->mUpload = new UploadFromUpload( $desiredDestName ); - $this->mUpload->initialize( - $request->getFileTempName( 'wpUploadFile' ), - $request->getFileSize( 'wpUploadFile' ), - $request->getFileName( 'wpUploadFile' ) - ); + $this->initializeFromUpload( $request ); } } } + /** + * Initialize the uploaded file from PHP data + * @access private + */ + function initializeFromUpload( $request ) { + $this->mTempPath = $request->getFileTempName( 'wpUploadFile' ); + $this->mFileSize = $request->getFileSize( 'wpUploadFile' ); + $this->mSrcName = $request->getFileName( 'wpUploadFile' ); + $this->mCurlError = $request->getUploadError( 'wpUploadFile' ); + $this->mSessionKey = false; + $this->mStashed = false; + $this->mRemoveTempFile = false; // PHP will handle this + } + + /** + * Copy a web file to a temporary file + * @access private + */ + function initializeFromUrl( $request ) { + global $wgTmpDirectory; + $url = $request->getText( 'wpUploadFileURL' ); + $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' ); + + $this->mTempPath = $local_file; + $this->mFileSize = 0; # Will be set by curlCopy + $this->mCurlError = $this->curlCopy( $url, $local_file ); + $pathParts = explode( '/', $url ); + $this->mSrcName = array_pop( $pathParts ); + $this->mSessionKey = false; + $this->mStashed = false; + + // PHP won't auto-cleanup the file + $this->mRemoveTempFile = file_exists( $local_file ); + } + + /** + * Safe copy from URL + * Returns true if there was an error, false otherwise + */ + private function curlCopy( $url, $dest ) { + global $wgUser, $wgOut; + + if( !$wgUser->isAllowed( 'upload_by_url' ) ) { + $wgOut->permissionRequired( 'upload_by_url' ); + return true; + } + + # Maybe remove some pasting blanks :-) + $url = trim( $url ); + if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) { + # Only HTTP or FTP URLs + $wgOut->showErrorPage( 'upload-proto-error', 'upload-proto-error-text' ); + return true; + } + + # Open temporary file + $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" ); + if( $this->mCurlDestHandle === false ) { + # Could not open temporary file to write in + $wgOut->showErrorPage( 'upload-file-error', 'upload-file-error-text'); + return true; + } + + $ch = curl_init(); + curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug + curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout + curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed + curl_setopt( $ch, CURLOPT_URL, $url); + curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) ); + curl_exec( $ch ); + $error = curl_errno( $ch ) ? true : false; + $errornum = curl_errno( $ch ); + // if ( $error ) print curl_error ( $ch ) ; # Debugging output + curl_close( $ch ); + + fclose( $this->mCurlDestHandle ); + unset( $this->mCurlDestHandle ); + if( $error ) { + unlink( $dest ); + if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) ) + $wgOut->showErrorPage( 'upload-misc-error', 'upload-misc-error-text' ); + else + $wgOut->showErrorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" ); + } + return $error; + } + + /** + * Callback function for CURL-based web transfer + * Write data to file unless we've passed the length limit; + * if so, abort immediately. + * @access private + */ + function uploadCurlCallback( $ch, $data ) { + global $wgMaxUploadSize; + $length = strlen( $data ); + $this->mFileSize += $length; + if( $this->mFileSize > $wgMaxUploadSize ) { + return 0; + } + fwrite( $this->mCurlDestHandle, $data ); + return $length; + } /** * Start doing stuff @@ -114,24 +226,20 @@ class UploadForm { */ function execute() { global $wgUser, $wgOut; + global $wgEnableUploads; # Check uploading enabled - if( !UploadBase::isEnabled() ) { + if( !$wgEnableUploads ) { $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) ); return; } # Check permissions - if( $this->mUpload ) { - $permission = $this->mUpload->isAllowed( $wgUser ); - } else { - $permission = $wgUser->isAllowed( 'upload' ) ? true : 'upload'; - } - if( $permission !== true ) { + if( !$wgUser->isAllowed( 'upload' ) ) { if( !$wgUser->isLoggedIn() ) { $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' ); } else { - $wgOut->permissionRequired( $permission ); + $wgOut->permissionRequired( 'upload' ); } return; } @@ -148,25 +256,20 @@ class UploadForm { } if( $this->mReUpload ) { - // User did not choose to ignore warnings - if( !$this->mUpload->unsaveUploadedFile() ) { + if( !$this->unsaveUploadedFile() ) { return; } # Because it is probably checked and shouldn't be $this->mIgnoreWarning = false; $this->mainUploadForm(); - } elseif( $this->mUpload && ( - 'submit' == $this->mAction || - $this->mUploadClicked - ) ) { + } else if( 'submit' == $this->mAction || $this->mUploadClicked ) { $this->processUpload(); } else { $this->mainUploadForm(); } - - if( $this->mUpload ) - $this->mUpload->cleanupTempFile(); + + $this->cleanupTempFile(); } /** @@ -182,45 +285,44 @@ class UploadForm { $value = $this->internalProcessUpload( $details ); switch($value) { - case UploadBase::SUCCESS: + case self::SUCCESS: $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); break; - case UploadBase::BEFORE_PROCESSING: - // Do... nothing? Why? + case self::BEFORE_PROCESSING: break; - case UploadBase::LARGE_FILE_SERVER: + case self::LARGE_FILE_SERVER: $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); break; - case UploadBase::EMPTY_FILE: + case self::EMPTY_FILE: $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); break; - case UploadBase::MIN_LENGTH_PARTNAME: + case self::MIN_LENGHT_PARTNAME: $this->mainUploadForm( wfMsgHtml( 'minlength1' ) ); break; - case UploadBase::ILLEGAL_FILENAME: - $this->uploadError( wfMsgExt( 'illegalfilename', - 'parseinline', $details['filtered'] ) ); + case self::ILLEGAL_FILENAME: + $filtered = $details['filtered']; + $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) ); break; - case UploadBase::PROTECTED_PAGE: + case self::PROTECTED_PAGE: $wgOut->showPermissionsErrorPage( $details['permissionserrors'] ); break; - case UploadBase::OVERWRITE_EXISTING_FILE: - $this->uploadError( wfMsgExt( $details['overwrite'], - 'parseinline' ) ); + case self::OVERWRITE_EXISTING_FILE: + $errorText = $details['overwrite']; + $this->uploadError( $wgOut->parse( $errorText ) ); break; - case UploadBase::FILETYPE_MISSING: + case self::FILETYPE_MISSING: $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) ); break; - case UploadBase::FILETYPE_BADTYPE: + case self::FILETYPE_BADTYPE: $finalExt = $details['finalExt']; $this->uploadError( wfMsgExt( 'filetype-banned-type', @@ -230,30 +332,29 @@ class UploadForm { wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), $wgFileExtensions ), - $wgLang->formatNum( count( $wgFileExtensions ) ) + $wgLang->formatNum( count($wgFileExtensions) ) ) ); break; - case UploadBase::VERIFICATION_ERROR: - $args = $details['veri']; - $code = array_shift( $args ); - $this->uploadError( wfMsgExt( $code, 'parseinline', $args ) ); + case self::VERIFICATION_ERROR: + $veri = $details['veri']; + $this->uploadError( $veri->toString() ); break; - case UploadBase::UPLOAD_VERIFICATION_ERROR: + case self::UPLOAD_VERIFICATION_ERROR: $error = $details['error']; - $this->uploadError( wfMsgExt( $error, 'parseinline' ) ); + $this->uploadError( $error ); break; - case UploadBase::UPLOAD_WARNING: + case self::UPLOAD_WARNING: $warning = $details['warning']; $this->uploadWarning( $warning ); break; - case UploadBase::INTERNAL_ERROR: - $status = $details['internal']; - $this->showError( $wgOut->parse( $status->getWikiText() ) ); + case self::INTERNAL_ERROR: + $internal = $details['internal']; + $this->showError( $internal ); break; default: @@ -275,54 +376,207 @@ class UploadForm { if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) { wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file." ); - return UploadBase::BEFORE_PROCESSING; + return self::BEFORE_PROCESSING; + } + + /** + * If there was no filename or a zero size given, give up quick. + */ + if( trim( $this->mSrcName ) == '' || empty( $this->mFileSize ) ) { + return self::EMPTY_FILE; + } + + /* Check for curl error */ + if( $this->mCurlError ) { + return self::BEFORE_PROCESSING; + } + + /** + * Chop off any directories in the given filename. Then + * filter out illegal characters, and try to make a legible name + * out of it. We'll strip some silently that Title would die on. + */ + if( $this->mDesiredDestName ) { + $basename = $this->mDesiredDestName; + } else { + $basename = $this->mSrcName; } + $filtered = wfStripIllegalFilenameChars( $basename ); + + /** + * We'll want to blacklist against *any* 'extension', and use + * only the final one for the whitelist. + */ + list( $partname, $ext ) = $this->splitExtensions( $filtered ); + + if( count( $ext ) ) { + $finalExt = $ext[count( $ext ) - 1]; + } else { + $finalExt = ''; + } + + # If there was more than one "extension", reassemble the base + # filename to prevent bogus complaints about length + if( count( $ext ) > 1 ) { + for( $i = 0; $i < count( $ext ) - 1; $i++ ) + $partname .= '.' . $ext[$i]; + } + + if( strlen( $partname ) < 1 ) { + return self::MIN_LENGHT_PARTNAME; + } + + $nt = Title::makeTitleSafe( NS_IMAGE, $filtered ); + if( is_null( $nt ) ) { + $resultDetails = array( 'filtered' => $filtered ); + return self::ILLEGAL_FILENAME; + } + $this->mLocalFile = wfLocalFile( $nt ); + $this->mDestName = $this->mLocalFile->getName(); /** * If the image is protected, non-sysop users won't be able * to modify it by uploading a new revision. */ - $permErrors = $this->mUpload->verifyPermissions( $wgUser ); - if( $permErrors !== true ) { + $permErrors = $nt->getUserPermissionsErrors( 'edit', $wgUser ); + $permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $wgUser ); + $permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $wgUser ) ); + + if( $permErrors || $permErrorsUpload || $permErrorsCreate ) { + // merge all the problems into one list, avoiding duplicates + $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) ); + $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsCreate, $permErrors ) ); $resultDetails = array( 'permissionserrors' => $permErrors ); - return UploadBase::PROTECTED_PAGE; + return self::PROTECTED_PAGE; } - // Check whether this is a sane upload - $result = $this->mUpload->verifyUpload( $resultDetails ); - if( $result != UploadBase::OK ) - return $result; + /** + * In some cases we may forbid overwriting of existing files. + */ + $overwrite = $this->checkOverwrite( $this->mDestName ); + if( $overwrite !== true ) { + $resultDetails = array( 'overwrite' => $overwrite ); + return self::OVERWRITE_EXISTING_FILE; + } - $this->mLocalFile = $this->mUpload->getLocalFile(); + /* Don't allow users to override the blacklist (check file extension) */ + global $wgCheckFileExtensions, $wgStrictFileExtensions; + global $wgFileExtensions, $wgFileBlacklist; + if ($finalExt == '') { + return self::FILETYPE_MISSING; + } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || + ($wgCheckFileExtensions && $wgStrictFileExtensions && + !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { + $resultDetails = array( 'finalExt' => $finalExt ); + return self::FILETYPE_BADTYPE; + } - if( !$this->mIgnoreWarning ) { - $warnings = $this->mUpload->checkWarnings(); - - if( count( $warnings ) ) { - $resultDetails = array( 'warning' => $warnings ); - return UploadBase::UPLOAD_WARNING; + /** + * Look at the contents of the file; if we can recognize the + * type but it's corrupt or data of the wrong type, we should + * probably not accept it. + */ + if( !$this->mStashed ) { + $this->mFileProps = File::getPropsFromPath( $this->mTempPath, $finalExt ); + $this->checkMacBinary(); + $veri = $this->verify( $this->mTempPath, $finalExt ); + + if( $veri !== true ) { //it's a wiki error... + $resultDetails = array( 'veri' => $veri ); + return self::VERIFICATION_ERROR; + } + + /** + * Provide an opportunity for extensions to add further checks + */ + $error = ''; + if( !wfRunHooks( 'UploadVerification', + array( $this->mDestName, $this->mTempPath, &$error ) ) ) { + $resultDetails = array( 'error' => $error ); + return self::UPLOAD_VERIFICATION_ERROR; } } + /** + * Check for non-fatal conditions + */ + if ( ! $this->mIgnoreWarning ) { + $warning = ''; + + global $wgCapitalLinks; + if( $wgCapitalLinks ) { + $filtered = ucfirst( $filtered ); + } + if( $basename != $filtered ) { + $warning .= '
  • '.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'
  • '; + } + + global $wgCheckFileExtensions; + if ( $wgCheckFileExtensions ) { + if ( !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) { + global $wgLang; + $warning .= '
  • ' . + wfMsgExt( 'filetype-unwanted-type', + array( 'parseinline' ), + htmlspecialchars( $finalExt ), + implode( + wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), + $wgFileExtensions + ), + $wgLang->formatNum( count($wgFileExtensions) ) + ) . '
  • '; + } + } + + global $wgUploadSizeWarning; + if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) { + $skin = $wgUser->getSkin(); + $wsize = $skin->formatSize( $wgUploadSizeWarning ); + $asize = $skin->formatSize( $this->mFileSize ); + $warning .= '
  • ' . wfMsgHtml( 'large-file', $wsize, $asize ) . '
  • '; + } + if ( $this->mFileSize == 0 ) { + $warning .= '
  • '.wfMsgHtml( 'emptyfile' ).'
  • '; + } + + if ( !$this->mDestWarningAck ) { + $warning .= self::getExistsWarning( $this->mLocalFile ); + } + + $warning .= $this->getDupeWarning( $this->mTempPath ); + + if( $warning != '' ) { + /** + * Stash the file in a temporary location; the user can choose + * to let it through and we'll complete the upload then. + */ + $resultDetails = array( 'warning' => $warning ); + return self::UPLOAD_WARNING; + } + } + /** * Try actually saving the thing... - * It will show an error form on failure. No it will not. + * It will show an error form on failure. */ $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, $this->mCopyrightStatus, $this->mCopyrightSource ); - $status = $this->mUpload->performUpload( $this->mComment, $pageText, $this->mWatchthis, $wgUser ); - + $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, + File::DELETE_SOURCE, $this->mFileProps ); if ( !$status->isGood() ) { - $resultDetails = array( 'internal' => $status ); - return UploadBase::INTERNAL_ERROR; + $resultDetails = array( 'internal' => $status->getWikiText() ); + return self::INTERNAL_ERROR; } else { + if ( $this->mWatchthis ) { + global $wgUser; + $wgUser->addWatch( $this->mLocalFile->getTitle() ); + } // Success, redirect to description page - // WTF WTF WTF? $img = null; // @todo: added to avoid passing a ref to null - should this be defined somewhere? - wfRunHooks( 'SpecialUploadComplete', array( &$this ) ); - return UploadBase::SUCCESS; + wfRunHooks( 'UploadComplete', array( &$this ) ); + return self::SUCCESS; } } @@ -332,21 +586,37 @@ class UploadForm { * Returns an HTML fragment consisting of one or more LI elements if there is a warning * Returns an empty string if there is no warning */ - static function getExistsWarning( $exists ) { + static function getExistsWarning( $file ) { global $wgUser, $wgContLang; - - if( $exists === false ) - return ''; - + // Check for uppercase extension. We allow these filenames but check if an image + // with lowercase extension exists already $warning = ''; $align = $wgContLang->isRtl() ? 'left' : 'right'; - list( $existsType, $file ) = $exists; + if( strpos( $file->getName(), '.' ) == false ) { + $partname = $file->getName(); + $rawExtension = ''; + } else { + $n = strrpos( $file->getName(), '.' ); + $rawExtension = substr( $file->getName(), $n + 1 ); + $partname = substr( $file->getName(), 0, $n ); + } $sk = $wgUser->getSkin(); - if( $existsType == 'exists' ) { - // Exact match + if ( $rawExtension != $file->getExtension() ) { + // We're not using the normalized form of the extension. + // Normal form is lowercase, using most common of alternate + // extensions (eg 'jpg' rather than 'JPEG'). + // + // Check for another file using the normalized form... + $nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() ); + $file_lc = wfLocalFile( $nt_lc ); + } else { + $file_lc = false; + } + + if( $file->exists() ) { $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); if ( $file->allowInlineDisplay() ) { $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ), @@ -361,18 +631,18 @@ class UploadForm { $warning .= '
  • ' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '
  • ' . $dlink2; - } elseif( $existsType == 'page-exists' ) { + } elseif( $file->getTitle()->getArticleID() ) { $lnk = $sk->makeKnownLinkObj( $file->getTitle(), '', 'redirect=no' ); $warning .= '
  • ' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '
  • '; - } elseif ( $existsType == 'exists-normalized' ) { + } elseif ( $file_lc && $file_lc->exists() ) { # Check if image with lowercase extension exists. # It's not forbidden but in 99% it makes no sense to upload the same filename with uppercase extension - $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); - if ( $file->allowInlineDisplay() ) { - $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ), - $file->getTitle()->getText(), $align, array(), false, true ); - } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { - $icon = $file->iconThumb(); + $dlink = $sk->makeKnownLinkObj( $nt_lc ); + if ( $file_lc->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $nt_lc->getText(), $align, array(), false, true ); + } elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) { + $icon = $file_lc->iconThumb(); $dlink2 = '
    ' . $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . $dlink . '
    '; } else { @@ -384,27 +654,57 @@ class UploadForm { $file->getTitle()->getPrefixedText(), $dlink ) . '' . $dlink2; - } elseif ( $existsType == 'thumb' ) { - # Check if an image without leading '180px-' (or similiar) exists - $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); - if ( $file->allowInlineDisplay() ) { - $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), - wfMsgExt( 'fileexists-thumb', 'parseinline' ), - $file->getTitle()->getText(), $align, array(), false, true ); - } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { - $icon = $file->iconThumb(); - $dlink2 = '
    ' . - $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . - $dlink . '
    '; + } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' ) + && ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) ) + { + # Check for filenames like 50px- or 180px-, these are mostly thumbnails + $nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $rawExtension ); + $file_thb = wfLocalFile( $nt_thb ); + if ($file_thb->exists() ) { + # Check if an image without leading '180px-' (or similiar) exists + $dlink = $sk->makeKnownLinkObj( $nt_thb); + if ( $file_thb->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $nt_thb, + wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $nt_thb->getText(), $align, array(), false, true ); + } elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) { + $icon = $file_thb->iconThumb(); + $dlink2 = '
    ' . + $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . + $dlink . '
    '; + } else { + $dlink2 = ''; + } + + $warning .= '
  • ' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . + '
  • ' . $dlink2; } else { - $dlink2 = ''; + # Image w/o '180px-' does not exists, but we do not like these filenames + $warning .= '
  • ' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , + substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '
  • '; } - $warning .= '
  • ' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . - '
  • ' . $dlink2; + } + + $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist(); + # Do the match + foreach( $filenamePrefixBlacklist as $prefix ) { + if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { + $warning .= '
  • ' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $prefix ) . '
  • '; + break; + } + } + + if ( $file->wasDeleted() && !$file->exists() ) { + # If the file existed before and was deleted, warn the user of this + # Don't bother doing so if the file exists now, however + $ltitle = SpecialPage::getTitleFor( 'Log' ); + $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), + 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); + $warning .= '
  • ' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '
  • '; } return $warning; } - + /** * Get a list of warnings * @@ -420,9 +720,7 @@ class UploadForm { } $s = ' '; if ( $file ) { - $exists = UploadBase::getExistsWarning( $file ); - $warning = self::getExistsWarning( $exists ); - // FIXME: We probably also want the prefix blacklist and the wasdeleted check here + $warning = self::getExistsWarning( $file ); if ( $warning !== '' ) { $s = ""; } @@ -453,7 +751,9 @@ class UploadForm { * Check for duplicate files and throw up a warning before the upload * completes. */ - public static function getDupeWarning( $dupes ) { + function getDupeWarning( $tempfile ) { + $hash = File::sha1Base36( $tempfile ); + $dupes = RepoGroup::singleton()->findBySha1( $hash ); if( $dupes ) { global $wgOut; $msg = ""; @@ -472,6 +772,85 @@ class UploadForm { } } + /** + * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]] + * + * @return array list of prefixes + */ + public static function getFilenamePrefixBlacklist() { + $blacklist = array(); + $message = wfMsgForContent( 'filename-prefix-blacklist' ); + if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) { + $lines = explode( "\n", $message ); + foreach( $lines as $line ) { + // Remove comment lines + $comment = substr( trim( $line ), 0, 1 ); + if ( $comment == '#' || $comment == '' ) { + continue; + } + // Remove additional comments after a prefix + $comment = strpos( $line, '#' ); + if ( $comment > 0 ) { + $line = substr( $line, 0, $comment-1 ); + } + $blacklist[] = trim( $line ); + } + } + return $blacklist; + } + + /** + * Stash a file in a temporary directory for later processing + * after the user has confirmed it. + * + * If the user doesn't explicitly cancel or accept, these files + * can accumulate in the temp directory. + * + * @param string $saveName - the destination filename + * @param string $tempName - the source temporary file to save + * @return string - full path the stashed file, or false on failure + * @access private + */ + function saveTempUploadedFile( $saveName, $tempName ) { + global $wgOut; + $repo = RepoGroup::singleton()->getLocalRepo(); + $status = $repo->storeTemp( $saveName, $tempName ); + if ( !$status->isGood() ) { + $this->showError( $status->getWikiText() ); + return false; + } else { + return $status->value; + } + } + + /** + * Stash a file in a temporary directory for later processing, + * and save the necessary descriptive info into the session. + * Returns a key value which will be passed through a form + * to pick up the path info on a later invocation. + * + * @return int + * @access private + */ + function stashSession() { + $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath ); + + if( !$stash ) { + # Couldn't save the file. + return false; + } + + $key = mt_rand( 0, 0x7fffffff ); + $_SESSION['wsUploadData'][$key] = array( + 'mTempPath' => $stash, + 'mFileSize' => $this->mFileSize, + 'mSrcName' => $this->mSrcName, + 'mFileProps' => $this->mFileProps, + 'version' => self::SESSION_VERSION, + ); + return $key; + } + /** * Remove a temporarily kept file stashed by saveTempUploadedFile(). * @access private @@ -479,9 +858,10 @@ class UploadForm { */ function unsaveUploadedFile() { global $wgOut; - $success = $this->mUpload->unsaveUploadedFile(); + $repo = RepoGroup::singleton()->getLocalRepo(); + $success = $repo->freeTemp( $this->mTempPath ); if ( ! $success ) { - $wgOut->showFileDeleteError( $this->mUpload->getTempPath() ); + $wgOut->showFileDeleteError( $this->mTempPath ); return false; } else { return true; @@ -508,43 +888,19 @@ class UploadForm { * @param string $warning as HTML * @access private */ - function uploadWarning( $warnings ) { - global $wgOut, $wgUser; + function uploadWarning( $warning ) { + global $wgOut; global $wgUseCopyrightUpload; - $this->mSessionKey = $this->mUpload->stashSession(); + $this->mSessionKey = $this->stashSession(); if( !$this->mSessionKey ) { # Couldn't save file; an error has been displayed so let's go. return; } - - $sk = $wgUser->getSkin(); $wgOut->addHTML( '

    ' . wfMsgHtml( 'uploadwarning' ) . "

    \n" ); - $wgOut->addHTML( '
      ' ); - foreach( $warnings as $warning => $args ) { - $msg = null; - if( $warning == 'exists' ) { - if ( !$this->mDestWarningAck ) - $msg = self::getExistsWarning( $args ); - } elseif( $warning == 'duplicate' ) { - $msg = $this->getDupeWarning( $args ); - } elseif( $warning == 'filewasdeleted' ) { - $ltitle = SpecialPage::getTitleFor( 'Log' ); - $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), - 'type=delete&page=' . $args->getPrefixedUrl() ); - $msg = "\t
    • " . wfMsgWikiHtml( 'filewasdeleted', $llink ) . "
    • \n"; - } else { - if( is_bool( $args ) ) - $args = array(); - elseif( !is_array( $args ) ) - $args = array( $args ); - $msg = "\t
    • " . wfMsgExt( $warning, 'parseinline', $args ) . "
    • \n"; - } - if( $msg ) - $wgOut->addHTML( $msg ); - } - + $wgOut->addHTML( '
        ' . $warning . "
      \n" ); + $titleObj = SpecialPage::getTitleFor( 'Upload' ); if ( $wgUseCopyrightUpload ) { @@ -580,7 +936,7 @@ class UploadForm { function mainUploadForm( $msg='' ) { global $wgOut, $wgUser, $wgLang, $wgMaxUploadSize; global $wgUseCopyrightUpload, $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview; - global $wgRequest; + global $wgRequest, $wgAllowCopyUploads; global $wgStylePath, $wgStyleVersion; $useAjaxDestCheck = $wgUseAjax && $wgAjaxUploadDestCheck; @@ -688,7 +1044,7 @@ wgUploadAutoFill = {$autofill}; default: $val2 = $val; } - $val2 = UploadFromUrl::isEnabled() ? min( $wgMaxUploadSize, $val2 ) : $val2; + $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2; $maxUploadSize = '
      ' . wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), $wgLang->formatSize( $val2 ) ) . @@ -717,7 +1073,7 @@ wgUploadAutoFill = {$autofill}; $warningChecked = $this->mIgnoreWarning ? 'checked' : ''; // Prepare form for upload or upload/copy - if( UploadFromUrl::isEnabled() && $wgUser->isAllowed( 'upload_by_url' ) ) { + if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) { $filename_form = "" . @@ -915,17 +1271,412 @@ wgUploadAutoFill = {$autofill}; } } + /** + * Split a file into a base name and all dot-delimited 'extensions' + * on the end. Some web server configurations will fall back to + * earlier pseudo-'extensions' to determine type and execute + * scripts, so the blacklist needs to check them all. + * + * @return array + */ + function splitExtensions( $filename ) { + $bits = explode( '.', $filename ); + $basename = array_shift( $bits ); + return array( $basename, $bits ); + } + + /** + * Perform case-insensitive match against a list of file extensions. + * Returns true if the extension is in the list. + * + * @param string $ext + * @param array $list + * @return bool + */ + function checkFileExtension( $ext, $list ) { + return in_array( strtolower( $ext ), $list ); + } + + /** + * Perform case-insensitive match against a list of file extensions. + * Returns true if any of the extensions are in the list. + * + * @param array $ext + * @param array $list + * @return bool + */ + function checkFileExtensionList( $ext, $list ) { + foreach( $ext as $e ) { + if( in_array( strtolower( $e ), $list ) ) { + return true; + } + } + return false; + } + + /** + * Verifies that it's ok to include the uploaded file + * + * @param string $tmpfile the full path of the temporary file to verify + * @param string $extension The filename extension that the file is to be served with + * @return mixed true of the file is verified, a WikiError object otherwise. + */ + function verify( $tmpfile, $extension ) { + #magically determine mime type + $magic = MimeMagic::singleton(); + $mime = $magic->guessMimeType($tmpfile,false); + + #check mime type, if desired + global $wgVerifyMimeType; + if ($wgVerifyMimeType) { + + wfDebug ( "\n\nmime: <$mime> extension: <$extension>\n\n"); + #check mime type against file extension + if( !self::verifyExtension( $mime, $extension ) ) { + return new WikiErrorMsg( 'uploadcorrupt' ); + } + + #check mime type blacklist + global $wgMimeTypeBlacklist; + if( isset($wgMimeTypeBlacklist) && !is_null($wgMimeTypeBlacklist) + && $this->checkFileExtension( $mime, $wgMimeTypeBlacklist ) ) { + return new WikiErrorMsg( 'filetype-badmime', htmlspecialchars( $mime ) ); + } + } + + #check for htmlish code and javascript + if( $this->detectScript ( $tmpfile, $mime, $extension ) ) { + return new WikiErrorMsg( 'uploadscripted' ); + } + + /** + * Scan the uploaded file for viruses + */ + $virus= $this->detectVirus($tmpfile); + if ( $virus ) { + return new WikiErrorMsg( 'uploadvirus', htmlspecialchars($virus) ); + } + + wfDebug( __METHOD__.": all clear; passing.\n" ); + return true; + } + + /** + * Checks if the mime type of the uploaded file matches the file extension. + * + * @param string $mime the mime type of the uploaded file + * @param string $extension The filename extension that the file is to be served with + * @return bool + */ + static function verifyExtension( $mime, $extension ) { + $magic = MimeMagic::singleton(); + + if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) + if ( ! $magic->isRecognizableExtension( $extension ) ) { + wfDebug( __METHOD__.": passing file with unknown detected mime type; " . + "unrecognized extension '$extension', can't verify\n" ); + return true; + } else { + wfDebug( __METHOD__.": rejecting file with unknown detected mime type; ". + "recognized extension '$extension', so probably invalid file\n" ); + return false; + } + + $match= $magic->isMatchingExtension($extension,$mime); + + if ($match===NULL) { + wfDebug( __METHOD__.": no file extension known for mime type $mime, passing file\n" ); + return true; + } elseif ($match===true) { + wfDebug( __METHOD__.": mime type $mime matches extension $extension, passing file\n" ); + + #TODO: if it's a bitmap, make sure PHP or ImageMagic resp. can handle it! + return true; + + } else { + wfDebug( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" ); + return false; + } + } + + /** + * Heuristic for detecting files that *could* contain JavaScript instructions or + * things that may look like HTML to a browser and are thus + * potentially harmful. The present implementation will produce false positives in some situations. + * + * @param string $file Pathname to the temporary upload file + * @param string $mime The mime type of the file + * @param string $extension The extension of the file + * @return bool true if the file contains something looking like embedded scripts + */ + function detectScript($file, $mime, $extension) { + global $wgAllowTitlesInSVG; + + #ugly hack: for text files, always look at the entire file. + #For binarie field, just check the first K. + + if (strpos($mime,'text/')===0) $chunk = file_get_contents( $file ); + else { + $fp = fopen( $file, 'rb' ); + $chunk = fread( $fp, 1024 ); + fclose( $fp ); + } + + $chunk= strtolower( $chunk ); + + if (!$chunk) return false; + + #decode from UTF-16 if needed (could be used for obfuscation). + if (substr($chunk,0,2)=="\xfe\xff") $enc= "UTF-16BE"; + elseif (substr($chunk,0,2)=="\xff\xfe") $enc= "UTF-16LE"; + else $enc= NULL; + + if ($enc) $chunk= iconv($enc,"ASCII//IGNORE",$chunk); + + $chunk= trim($chunk); + + #FIXME: convert from UTF-16 if necessarry! + + wfDebug("SpecialUpload::detectScript: checking for embedded scripts and HTML stuff\n"); + + #check for HTML doctype + if (eregi("wrapWikiMsg( '
      $1
      ', array( 'virus-badscanner', $wgAntivirus ) ); + return wfMsg('virus-unknownscanner') . " $wgAntivirus"; + } + + # look up scanner configuration + $command = $wgAntivirusSetup[$wgAntivirus]["command"]; + $exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"]; + $msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ? + $wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null; + + if ( strpos( $command,"%f" ) === false ) { + # simple pattern: append file to scan + $command .= " " . wfEscapeShellArg( $file ); + } else { + # complex pattern: replace "%f" with file to scan + $command = str_replace( "%f", wfEscapeShellArg( $file ), $command ); + } + + wfDebug( __METHOD__.": running virus scan: $command \n" ); + + # execute virus scanner + $exitCode = false; + + #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too. + # that does not seem to be worth the pain. + # Ask me (Duesentrieb) about it if it's ever needed. + $output = array(); + if ( wfIsWindows() ) { + exec( "$command", $output, $exitCode ); + } else { + exec( "$command 2>&1", $output, $exitCode ); + } + + # map exit code to AV_xxx constants. + $mappedCode = $exitCode; + if ( $exitCodeMap ) { + if ( isset( $exitCodeMap[$exitCode] ) ) { + $mappedCode = $exitCodeMap[$exitCode]; + } elseif ( isset( $exitCodeMap["*"] ) ) { + $mappedCode = $exitCodeMap["*"]; + } + } + + if ( $mappedCode === AV_SCAN_FAILED ) { + # scan failed (code was mapped to false by $exitCodeMap) + wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" ); + + if ( $wgAntivirusRequired ) { + return wfMsg('virus-scanfailed', array( $exitCode ) ); + } else { + return NULL; + } + } else if ( $mappedCode === AV_SCAN_ABORTED ) { + # scan failed because filetype is unknown (probably imune) + wfDebug( __METHOD__.": unsupported file type $file (code $exitCode).\n" ); + return NULL; + } else if ( $mappedCode === AV_NO_VIRUS ) { + # no virus found + wfDebug( __METHOD__.": file passed virus scan.\n" ); + return false; + } else { + $output = join( "\n", $output ); + $output = trim( $output ); + + if ( !$output ) { + $output = true; #if there's no output, return true + } elseif ( $msgPattern ) { + $groups = array(); + if ( preg_match( $msgPattern, $output, $groups ) ) { + if ( $groups[1] ) { + $output = $groups[1]; + } + } + } + + wfDebug( __METHOD__.": FOUND VIRUS! scanner feedback: $output" ); + return $output; + } + } + + /** + * Check if the temporary file is MacBinary-encoded, as some uploads + * from Internet Explorer on Mac OS Classic and Mac OS X will be. + * If so, the data fork will be extracted to a second temporary file, + * which will then be checked for validity and either kept or discarded. + * + * @access private + */ + function checkMacBinary() { + $macbin = new MacBinary( $this->mTempPath ); + if( $macbin->isValid() ) { + $dataFile = tempnam( wfTempDir(), "WikiMacBinary" ); + $dataHandle = fopen( $dataFile, 'wb' ); + + wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" ); + $macbin->extractData( $dataHandle ); + + $this->mTempPath = $dataFile; + $this->mFileSize = $macbin->dataForkLength(); + + // We'll have to manually remove the new file if it's not kept. + $this->mRemoveTempFile = true; + } + $macbin->close(); + } + + /** + * If we've modified the upload file we need to manually remove it + * on exit to clean up. + * @access private + */ + function cleanupTempFile() { + if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) { + wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file {$this->mTempPath}\n" ); + unlink( $this->mTempPath ); + } + } + + /** + * Check if there's an overwrite conflict and, if so, if restrictions + * forbid this user from performing the upload. + * + * @return mixed true on success, WikiError on failure + * @access private + */ + function checkOverwrite( $name ) { + $img = wfFindFile( $name ); + + $error = ''; + if( $img ) { + global $wgUser, $wgOut; + if( $img->isLocal() ) { + if( !self::userCanReUpload( $wgUser, $img->name ) ) { + $error = 'fileexists-forbidden'; + } + } else { + if( !$wgUser->isAllowed( 'reupload' ) || + !$wgUser->isAllowed( 'reupload-shared' ) ) { + $error = "fileexists-shared-forbidden"; + } + } + } + + if( $error ) { + $errorText = wfMsg( $error, wfEscapeWikiText( $img->getName() ) ); + return $errorText; + } + + // Rockin', go ahead and upload + return true; + } + /** * Check if a user is the last uploader * * @param User $user * @param string $img, image name * @return bool - * @deprecated Use UploadBase::userCanReUpload */ public static function userCanReUpload( User $user, $img ) { - wfDeprecated( __METHOD__ ); - if( $user->isAllowed( 'reupload' ) ) return true; // non-conditional if( !$user->isAllowed( 'reupload-own' ) ) -- 2.20.1